Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 18:59:26 +0000 (11:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 18:59:26 +0000 (11:59 -0700)

Trivial merge